[DO-NOT-MERGE][SPARK-XXXXX][CORE][3.0] Port back SPARK-32557 and SPARK-33146 to branch-3.0#30051

HeartSaVioR wants to merge 2 commits intoapache:branch-3.0apache/spark:branch-3.0from

HeartSaVioR:port-back-SPARK-32557-SPARK-33146-to-branch-3.0HeartSaVioR/spark:port-back-SPARK-32557-SPARK-33146-to-branch-3.0Copy head branch name to clipboard