Merge branch 'en/t7518-unflake'