fix concurrency issue
Merging latest from develop
Merge branch 'feature/issue_105' into feature/udt
Merging concurrency issue resolution from issue 105.