Question point fix
Merge branch 'quickfix-qp' into staging