Merge "[DO NOT MERGE] Fix associations serialization optimization bug" into oc-dev