[MERGE] forward port of branch 7.0 up to f4870f8