Merge "Speculative fix of IMMS crash" into lmp-dev