[MERGE] forward port of branch 7.0 up to bbb8d8f25a7a81c26965aa76b5085961a13132d6