[NOJIRA] Commit noise cleanup
Merge pull request #1294 from yuhunglin/NOJIRA

[NOJIRA] Fixes for recent pulls