optional attributes and filename fixes
This tag has no release notes.