Fixed merge error
Merge branch 'vanilla_improvements' into datacratic_dev