Merge "Removing extra params from x_add_residual() functions" into experimental