Style improvements regarding tao3 guidelines, fixed operations with lists
Merge branch 'develop' into forge-3112
Merge branch 'forge-3112' into develop