merge in lmp-mr1-release history after reset to 0e4d1e92655d037ed4ddb3eca5360328b3833861