Integrated origin/dev_three