Merge branch 'doc/2.x/configuration' into 2.x