Depends on D19982
I think you can push this without the other patch, it does not really depend on it. Would be good to get this into 19.04 release.
Dropped reference to previous patch
In D19983#437962, @cfeck wrote:
No idea, i did not checked a bug was open while fixing it, and reading the bug comments does not give hint of its origin.
Yes, I also tend to think this should fix bug 401692.