Merge branch 'cb/maint-no-double-merge' into maint