Merge branch 'master' into Fix-WhiteSource-vulnerabilities

2 jobs for !372 with Fix-WhiteSource-vulnerabilities in 11 minutes and 59 seconds (queued for 4 seconds)
merge request