Merge "Save observer in call to commit" into oc-mr1-dev