Merge branch 'rt/cherry-revert-conflict-summary' into maint