merge in master-release history after reset to d2e4281204da89a77c9c9743e5cf54a1c3e42a4a