merge recent commits in the upstream into 10.0@re

this will be the last merge from master