merge in lmp-mr1-release history after reset to 91c395f6c344682f1ae5926766d4d7247dee6df4