Add in missing join.
Merge branch 'exclusive_items' into 4_5_x_working
Make sure join name is safe.
Merge branch 'exclusive_items' into 4_5_x_working