Merge branch 'ea/merge-code-cleanup'