Fixed staging bugs in develop brnach