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