Merge "Adapt to changing function signature." into main