merged v1.63