Fixes #12793 - reverted field filtration to enabled fields only
(cherry picked from commit 77b36c947ac954393dd2e7a09abfcaf4bc959bc9)
Fixes #12793 - reverted field filtration to enabled fields only
(cherry picked from commit 77b36c947ac954393dd2e7a09abfcaf4bc959bc9)