Changes from branch1