Merge pull request #11791 from versioncontrol/includes_with_persistent_select

Includes with persistent select, fixes #11773
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/finder_methods.rb