Integrated origin/dev1