Merge branch '2020-q2' into 'master'

2020 q2

See merge request !4
2 jobs for master in 4 minutes and 38 seconds