Xa recovery fix/3.2.3