Merge "Fix deadlock" into jb-mr1-dev