Merge "Disabling movement of entire affiliated task set." into nyc-dev