Merge "Fix broken volantis build"