merged v1.61