merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088f84e81f4ed4