refs 8209 除外検索の修正
Merge branch 'master', remote branch 'origin'