64907244 link objects to categories

@nthomson - https://www.pivotaltracker.com/story/show/64907244