Updated configuration example
Merge branch 'release/21-01-13' into develop