Integrated origin/ready/charter
merge