merge in lmp-release history after reset to ff2da2cdb332be35bc94e3e66a10d55fe7bb0105