Merge "Remove deprecated warnings for SKIP_VALIDATE" into main