add change_user
Merge branch '5027-non_root'