Merge configuration file changes from 3.3.x