Merge "Fix some QC issues" into jb-dev