Merge branch 'bc/fix-rebase-merge-skip'