Fixed staging bugs in develop branch.
Merge branch 'develop' into staging