Alternative boolean
Merge branch 'hotfix/boolean'