Merge branch 'jc/maint-simpler-common-prefix' into maint