Merge branch 'jc/combined' into maint