+ [OE-4143] fix comment formatting in view
Merge branch 'release/1.6' into develop