Merge "Fix granting default roles timeout."