Code

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