1c3628f3c6
Config: Fix date_formats options being moved to a different section (#109339)
* Config: Fix date_formats options being moved to a different section
* fix builder cache key
(cherry picked from commit 0069d112fc)