Merge branch 'jn/cherry-revert-message-clean-up' into next