Merge branch 'en/dirty-merge-fixes'