merge in lmp-mr1-release history after reset to 8fab8119dd176a280b62e9e8f2b4f08c0d76f36d