merge in master-release history after reset to ca5fae4589a463522375a0b6c28b2a5546b9ed75