refs4085 booleanの条件変更
Merge branch 'issue-4085'