Merge branch 'reinforce-configuration' into 'master'

Reinforce configuration

See merge request !43
3 jobs for master in 41 seconds (queued for 10 seconds)