merge in lmp-mr1-release history after reset to 2020564f21bb0216965f0f5c43c5c1c995785bab