Merge "Use initial value on save when value didn't change." into oc-dev