Always use pk when referring to primary keys
Merge branch 'master' into feature/es