Merge "Fix bug where owner info wasn't being updated properly." into jb-mr2-dev