Code clean-up
Merge remote-tracking branch 'origin/ENG-451-self-join' into ENG-451-self-join-master-merge