[MERGE] forward port of branch 7.0 up to da15c9d