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