Merge branch 'mz/cherry-code-cleanup'