Merge branch 'ak/t1016-style'