merge in lmp-release history after reset to 6b1f10f2554e7c0a15f8b4c1c05d7eb4b823e512