Merge remote-tracking branch 'upstream/master' into fix_swagger

2 jobs for !101 with fix_swagger in 25 minutes and 51 seconds (queued for 7 seconds)
latest merge request