BZ-12438 label on top
Merge branch 'Sprint73-CP' into integration