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