merge in lmp-mr1-release history after reset to 445111a1c977e94a4233efd54f3690defa4a7582