Added hanlder for changing owners.
Merge branch 'test' into dev