merge in lmp-mr1-release history after reset to 47a919c6fb1cb3f4d372758ed9a02b02bbac911c