Merge pull request #9845 from Extarys/frio-eslint-prettier