Commit for fixed upgrade issue for amazon s3 storage feature.