Merge branch 'pw/rebase-skip-commit-message-fix'