Merge branch 'en/remerge-diff-fixes'