Copied over changes from Intersect repository.