9/17 comments addressed
[SPARK-3418] Fixed MiMa compatibility issues (excluded from check)
Merge conflicts fixed
Fixed merge issues