[MERGE] forward port of branch 7.0 up to 3e3e35e