Fixed owner/info saving in dev/test environments (56459054)

These changes (mostly reorganizing the existing code) should fix the issues where info/owner would occasionally not save in the dev and test environments. This doesn't seem to be reproducible locally but I was able to test on dev by hot swapping in the code changes.