Merge Gordon's Branch 2