these were merged into spark-rc