Merge branch 'jm/t9138-style-fix'