Code

Merge branch 'jk/maint-decorate-01-bool'