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