Merge branch 'en/merge-fixes'