OGM-521 - WIP - Supporting compound keys in to-one associations