[RELEASE] Update configuration files
Merge branch 'release/v1.1' into develop