Advanced quick search.: refs  #612
Advanced quick search.: refs  #612
Merge remote-tracking branch 'origin/dev' into dev