Merge pull request #1027 from mobu-of-the-world/ts-eslint-v6

Merge pull request #1027 from mobu-of-the-world/ts-eslint-v6 #685