Merge "Return correct splines from ddc calls" into main