merge in lmp-mr1-release history after reset to 134bf12fce029efe7fa3f4bc18bdc58ebf7c90af