Merge branch 'master' into develop
Prevent collapsing of advanced search on choosing any value.
Merge branch 'hotfix'