[MERGE] forward port of branch 7.0 up to e5533d0