The PR created by dependabot has issues related to lint. This pull request cherry-pick-ed its changes and fixed the reported issues.