Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint