Use basic snapshot methods when S3 direct upload fails

[#84576764]
Release version 0.5.4

[#84576764]