[MERGE] forward port of branch 8.0 up to c41109f