Merge "Fix build" into jb-mr1-dev