merge in lmp-mr1-release history after reset to 6c473c2fbc6b19990f337a264b13ba11da73ac95