[SPARK-3944][Core] Using Option[String] where value can be null