Merge branch 'gs/rebase-allow-empty-message'