Merge "fix monkey NPE" into jb-dev