am 254bbae7: Merge "Fix some QC issues" into jb-dev

* commit '254bbae71abe3912a4d29e18bafbc68422130ac7':
  Fix some QC issues