Spark POC merged with maintenance/5.6