Fixed staging bugs in devlop branch--test