Merge "Disabling affiliated tasks." into nyc-dev