Merge in changes from velpt_dev for testing.