don't use spark
Merge branch 'dev' into guard

* dev:
  don't use spark