[firedrake] sprint to merge complex branch