Added update for owner change.
Merge branch 'test' into dev