Update to 3.5.0-bighorn