Merge "Split collect logic out of requestIfNeeded methods" into main