Merge "Fixing up some logic around excluded tasks"