Merge "eliminate changeOwnerAndMode()"