Merge branch 'rr/test-3200-style'