merge 70.01 private