Merge "BQ: fix Volantis test failures"