Fix concurrency issues CID-1230585 and CID-1230586
Merge branch 'bugfix/CID-1230585'