Merge branch 'frgc-fixes' into 'master'

FRGC Fixes - Round 2

See merge request !147
5 jobs for master in 31 minutes and 29 seconds (queued for 5 seconds)
Status Name Job ID Coverage
  Build
passed build_linux_37 #243620
docker

00:28:01

61.0%
passed build_linux_38 #243621
docker

00:25:17

61.0%
passed build_macos_intel_37 #243618
macos intel

00:21:42

54.0%
passed build_macos_intel_38 #243619
macos intel

00:18:37

55.0%
 
  Deploy
passed deploy_beta #243622
docker

00:03:27