Merge "Write dumpOnFailure to app files" into main