Integrated origin/dev6