Merge support for FALLBACK_SCSV