Merge branch 'advancedSearchDev' into master