Merge "Fix NPE" into lmp-mr1-dev