merge in master-release history after reset to 857a8f8b179d18c2ae69af55336e292fdd9c926f