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