Consolidate with current state of testing_x86_64 branch.