This won't get fixed for 13.1. In 13.2 there is another mechanism, there it might be worth to look at it.