EUCA-7120
Removed <> from labels.
Merge branch 'EUCA-7120' into maint/3.3/testing