Merge branch 'cb/diff-fname-optim' into maint