Fixed staging bugs in develop branch2.