Merge branch 'jc/maint-shared-literally' into maint