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