Merged updates from LTX internal source repository.