product - category bi-directional join
Merge remote-tracking branch 'origin/master'