Merge branch 'master' into jimahn/master_modify_similarityquery_page