merge in lmp-mr1-release history after reset to d25f8443ebf3ec5adb28ae6e24c3d17f6a0bdf7b