Merge branch 'jc/maint-follow-rename-fix'