Fix sanitize config
Merge branch 'hotfix/SanitizeConfig'

* hotfix/SanitizeConfig:
  Fix sanitize config