Merge branch 'bauermar-master-patch-82194' into 'master'

Upload Core Context 1.7

See merge request !9
2 jobs for master
in 2 seconds, using 0 compute credits, and was queued for 4 seconds