xla

4412fc22 - Adopt new changes in upstream