update branch develop
Fixes staging bugs in develop branch.