Merged v1.61 into one-run fix