*8785* Add setting to config files
*8785* Submodule changes track ##beghelli/8785-fix##
Merge pull request #219 from beghelli/8785-fix

*8785* Submodule changes track ##beghelli/8785-fix##