Fix style
Merge branch 'master' into PIM-2448