merge in lmp-release history after reset to aaad548535c34e2bba16b2a0b71173e0ae4b16c0