=rem #3646: Workaround for 3646 to not break protocol compatbility
Merge pull request #1771 from drewhk/wip-sysmsg-ack-optimization-workaround-drewhk

=rem #3646: Workaround for 3646 to not break protocol compatbility