merged v1.65-end-of-run