Merge "Fix concurrency issues" into jb-mr2-dev