Merge pull request #12648 from slavapestov/imported-materialize-for-set-override-bugs-4.0

Sema: Fix some issues with overrides of materializeForSet [4.0]