blind merge from latest v1.70