Merge branch 'bs/maint-rename-populate-filespec'