merge in lmp-mr1-release history after reset to 246fa63c97751a9c4fc7ceca41989aaf887b115a