Merge pull request #295 from zivchang/next

[bug fixing] TDIS-5690