Merge "Fix crash from non-default sims in QS" into oc-dev