Integrated origin/ready/52
Fixed conflict