Merge branch 'bs/maint-rename-populate-filespec' into maint * bs/maint-rename-populate-filespec: Rename detection: Avoid repeated filespec population