merge in lmp-release history after reset to a85a91fc48851780ddf114db90361e85cfa36bf8