[MERGE] forward port of branch 7.0 up to 767d2ea9a63ceb6d8473766f52eb06f69b281ca1