Merge branch '938-cppcheck-format-issues-v9_11' into 'v9_11'

Resolve "Cppcheck format issues."

See merge request !1696
2 jobs for v9_11 in 59 seconds (queued for 1 second)