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