Add a option 'filename', to be able to force the filename (Fix #8904)