Add merge label
Merge branch 'hotfix/halo-readd-merge-label'