Merge "Fix Concurrency issues in test 1941"