merge in lmp-mr1-release history after reset to b4d1e4368e2a7c6a62d6ad9d17bf7e431867f2ef