Merge "Fix build." into jb-dev