Port 396 - Foat MR 2169 to ivas-float-update See merge request !2461
mentioned in issue #2179 (closed)