Merge branch 'develop' into case-1972
 case 1972 - Tags right padding is added.
Merge branch 'develop' into case-1972
Merge branch 'case-1972' into develop