ticket:8 object pk instead of id
Merge branch 't8'