feat: #3570935 Issues reported by eslint

Closes #3570935

Merge request reports

Loading