Merge pull request #8228 from jaimeMF/disable-file-handler