merge in master-release history after reset to 33d39b59c0b590cd4cb2ac08ed6eeba7b7bcd971