Merge branch 'master' into issues/SPARK-3063