cms

Eager-load fields based on fields actually present in query

#15684

Open