Revert "Merge branch 'feature/10507_fix_clang_warnings' into develop"

This reverts commit 15299123a238fa3ec0d107158c295959b60551d4, reversing
changes made to 9bbe433972b34fe6c9103042bfb3d09da0aa96db.