[AE-727] merge with latest update from commit 5095851fc284f31e7d91d192c88d1bbcf02e1d0e https://github.com/apache/spark.git