merge holologic improvements from 1.8
merge vivid improvements from 1.8