merge in lmp-release history after reset to 85a3749faff7745d36312adf80eeab04391444ac