Fixed staging bugs by HW6  in develop branch.