Merge branch 'mg/complete-cherry-mark-to-log'