Allow to join on expression
Provide an option for polymorphic gateways in selections
Merge branch 'master' into upstream-master