refs 7825 modified advanced_search
Merge remote-tracking branch 'origin/master'