final commit for owner change support