Changed class name Configuration to Config
Merge remote-tracking branch 'origin/pr/1345' into develop

Forward port #1345