Merge "Fix VENDOR_MASK constant" into main