QP and SW edits
Merge branch 'qp/sc-edites' into staging