yuga: Bring in sync with 10.5.1.A.0.283