Merge branch 'fix_lint_void' into 'master'

Fix Lint/Void offences

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170402



Merged-by: Alejandro Rodríguez <alejandro@gitlab.com>
Approved-by: Michael Thomas <micthomas@gitlab.com>
Approved-by: Alejandro Rodríguez <alejandro@gitlab.com>
Co-authored-by: Martin Schurz <Martin.Schurz@telekom.de>