[NOJIRA] Labeling fixes
Merge pull request #514 from yuhunglin/NOJIRA3

[NOJIRA] Labeling fixes