OOIION-1548 Style Corrections R2