Merge branch 'v2.1-dev' into 'v2.x-master'

V2.1 dev

See merge request !3
3 jobs for v2.x-master in 7 minutes and 16 seconds (queued for 3 seconds)