Add Spark support into Magpie
Merge branch 'spark'
Update for 1.33/1.34 releases