Merge branch 'en/t7406-fixes'