Merge changes Ib201260f,Ib3cd7e42 into main

* changes:
  Moving CrashRecoveryFiles to a separate Folder
  Introduce CrashRecovery Adaptor