Applied formatting changes from develop
Merge branch 'tmgmt-retranslation' into hotfix