release-1.6-prerelease1
ESLint: enabled no-trailing-spaces and eol-last rules
Respond to review comments.