[Backport 2.11] Fix to include static settings in addition to dynamic repo metadata

[Backport 2.11] Fix to include static settings in addition to dynamic repo metadata #12795