Merge "Fix task selection logic" into nyc-dev