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