#7186 Fix to handle FileAttachment where name includes file extension