Copying delegator changes from master