Fixed staging branch bugs in develop branch.