Merge branch '20200806_183203' into 'develop'

20200806 183203

See merge request !168
4 jobs for develop in 2 minutes and 48 seconds (queued for 1 second)