Fix Xml over Tcp protocol timeout bug
Merge branch 'develop' into feature/issue-561-fix-xml-over-tcp-protocol-timeout-reset-bug
Merge branch 'feature/issue-561-fix-xml-over-tcp-protocol-timeout-reset-bug' into develop