=rem #3606 Properly reset system message buffer between remote sys restarts
Merge pull request #1737 from drewhk/wip-3606-resend-unfulfillable-drewhk

=rem #3606 Properly reset system message buffer between remote sys restarts
Merge remote-tracking branch: upstream/master