merge in master-release history after reset to 5491a4fd4dc26e258848472e8a91b03eb17df21d