merge in lmp-mr1-release history after reset to 9272c536070170865b7ab9b49b923f80079befdd