[MERGE] forward port of branch 7.0 up to 78a29b3