Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint