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