ORION-257 - Escape special chars in search
Merge remote-tracking branch 'origin/master'