merge in master-release history after reset to edc7592fefbdbb6a6f7b430936a10b8b5745620d