* Fix for issue #19890 * Updated with better fix from the V3 PR #18651 * Formatting fix * Fixed issue with incorrect type (double instead of float) when compiling on certain platforms. * Another attempt to fix compilation issue