Merge "Fix deadlock in SF." into jb-mr1-dev