Integrated origin/dev_four