Merge "Update defaults for s3 materials paths/names"