Release 5.0.0
Remove unnecessary JOIN (#5184)

* Remove unnecessary JOIN

* Fix tests, also some context leaks

* Add to CHANGELOG

(cherry picked from commit 330ac87294439d617c59047642042edd2cc49172)
3 files changed