fix some of the override saving logic (when there is no override value)
Merge branch 'mass_prepare' into testing