re #7885 merge master re #8134 merge master; re #8154 merge master; re #8136 merge master; no comments
re #7885 merge master re #8134 merge master; re #8154 merge master; re #8136 merge master; no comments