Use null column for association key types
Merge pull request #15502 from sgrif/sg-use-null-column

Use null column for association key types