[MERGE] forward port of branch 8.0 up to ed1c173