Code

Merge branch 'jm/maint-misc-fix' into maint