Always load CommonObject objects via OM to avoid duplicate instances.
Merge remote-tracking branch 'upstream/master'