I just checked, if I can pull this for a 2.2.0 bug fix release.
But the changes in the referenced issue #1715 is just the end of a bunch of commits addressing this problem, thus it's not so easy.
On the other hand, the latest master has merged a bunch of buggy features and there are still issues popping up, so I think it's not ready for a release yet.
Armin
investing less than half an hour into Search function can save hours or days of waiting for a solution