Merge branch 'as/t4012-style-updates'