Merge "Fixes for QS:" into jb-mr1-dev