merge in lmp-mr1-release history after reset to 2c315e152655f1d987c2a743d37e8a296f35df1a