Merge pull request #1705 from kodustech/fix/centralized-config-ownership