Merge branch 'ee-infrastructure' into 'master'

Version 1.1

See merge request !2
1 job for master in 1 minute and 3 seconds (queued for 3 seconds)