Merge branch 'master' into 21-bool