Merge branch 'rt/rebase-in-c-message-fix'