merge key exchange patch without rekeying support