merge in lmp-mr1-release history after reset to 844b2e166c6218018e9676994cff8d5d2a8cbf62