xla

7b3b598f - Address review comments from #3550 (#3578)