merge in master-release history after reset to 7d7f5e58db76fb2c437e6a6fb0f196004be604a8