335988 Updates to fix the build with the latest version of virgo-build
7 files changed