Merge remote-tracking branch 'remotes/origin/resolution'

5 jobs for master in 3 minutes and 23 seconds (queued for 1 second)
Status Job ID Name Coverage
  Ocgcore
passed #22435
linux
ocgcore_linux

00:01:58

passed #22434
vs
ocgcore_windows

00:01:07

 
  Build And Test
canceled #22436
linux
build-StandaloneLinux64

00:01:24

canceled #22437
linux
build-StandaloneOSX

00:01:24

canceled #22438
linux
build-StandaloneWindows64

00:01:24