CR for Job #19966 - Finish the Labels feature

Code Review for Job #19966 - Workitem available at https://www.worklist.net/19966