Pull updates from lis-test