This MR ports fix #1137 from the floating point repo to the ivas-float-update branch.
ivas-float-update