Merge branch 'issues/UAT-173_type_descriptions'
formatting