Merge branch 'jc/maint-refs-dangling' into maint