[Config] fix consistency
merged branch vicb/fix-config (PR #491)

This PR was merged into the 2.2 branch.

Commits
-------

c70473e [Config] fix consistency

Discussion
----------

[Config] fix consistency