merge in lmp-mr1-release history after reset to 95068e08807b06f8b95bfc88cde1a55e96a8db26