Merge "Revert "Merge errors."" into jb-dev