Merge pull request #2963 from russlan23/chore/eslint-object-curly-spacing-1502