Merge pull request #11952 from lmarcetic/master

Remove set_primary_key, replace with primary_key=