Jia dev to e dev

Ellen Shuterequested to merge
jia_dev into dev_e

lets see if this works

Merge request reports