Merge "Increase busy timeout." into jb-dev