[12775] Final fix for clang compiler