set default keepalive timeout as 1 hours
merge from origin
new message structure