xla

9cf23956 - rebasing to xla head to support issue #3012