Fixed staging bugs in develop branch3.