Add more checks to pre-commit hook

Add more checks to pre-commit hook #6994