Merged role changer code into master