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