Merge branch...

Merge branch '1712-compilation-errors-with-instrumentation-in-ivas-float-update' into 'ivas-float-update'

Resolve "Compilation errors with instrumentation in ivas-float-update"

See merge request !1648