[MERGE] forward port of branch 7.0 up to 9a37e5a