xla

e334608f - Adjust to latest changes to core