merge in lmp-mr1-release history after reset to 3574b085f46a5b22ee660a9fd3ef727a20c106ee