iiii
Merge branch 'cepatch/stgfix' into staging/5

* cepatch/stgfix:
  iiii