cherry picking fixes from bob for updated gto #3

Closed nconrad closed 6 years ago