Merge changes If47feb07,Idf3d00e9 into main

* changes:
  Utils required for CrashRecovery module
  Cleanup code behind flag calling hidden api