Merge pull request #1697 from kodustech/fix/centralized-config-directory-only-baseline