Merge branch 'jc/shared-literally' into maint