Merge "Fix NPE" into jb-mr1-dev