Merge "Add a timestamp (of the crash) header the java crashes" into main