Various fixes search
Merge branch 'release-R1-bugfix-S4' into develop