Merge branch 'MH-637' into MH-637-cl
More standard label set
Merge branch 'MH-637-cl' into dev