Re #9267. Another place where we need to get the type right.
Merge branch 'bugfix/9267_msvc_compiler_warnings' into develop