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