Updated the pull request following Davide D'Alto latest developments.
Could someone review it in order to accept the pull request, please? It seems I can press the « Merge pull request » button on Github, but I guess I'm not supposed to
As is the case with HSEARCH-2070, this bug is rather blocking for my team, so we'd appreciate very much if this fix was integrated into a maintenance release.