Merge branch 'en/t3031-title-fix'