Fix the OperationCanceledException seen in TISTUD-4692.
Merge pull request #73 from mxia/development

Fix the OperationCanceledException seen in TISTUD-4692.