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 Job ID Name Coverage
  Build
passed #243620
docker
build_linux_37

00:28:01

61.0%
passed #243621
docker
build_linux_38

00:25:17

61.0%
passed #243618
intel macos
build_macos_intel_37

00:21:42

54.0%
passed #243619
intel macos
build_macos_intel_38

00:18:37

55.0%
 
  Deploy
passed #243622
docker
deploy_beta

00:03:27