Merge pull request #2150 from deepak-srivastava/44-customextends-join-override