Merged v1.70