Merge branch 'spark-plugin', remote-tracking branch 'github/spark-plugin' into spark-plugin
Fix indentation