Hi,
you are right. I have integrated your change and I got an image, but I will not be able to test it before wednesday. When this is done, I will create a pull request for master. If you can test it before, you are welcome to create a pull request.
I created a pull request for 19.07: https://github.com/openwrt/openwrt/pull/3725.
bests
Sascha