Fixes configuration issue
Merge branch 'fix-configuration' into 2.2