[MERGE] forward port of branch 8.0 up to 2e092ac