ENG-6122 Improved statelessness for handling recovery