Merge branch 'jc/maint-remove-renamed-ref' into maint