SPARK-3789: WIP