Merge "Handle errors corrected exit status returned by fsck" into main