Fix for comment/note not receiving proper label
Merge branch 'dev' into test