xa 2.3.6

Closes #31822.