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