Modified for (automatic) conditional spark-inclusion.