[sd2_mr0558] Clean up & correct style (ICC)
Merge branch 'master' of git@github.com:mangosR2/scriptdev2.git into R2