some fixes
Merge branch 'staging' into develop
additional fixes