Merge branch 'ivas-float-update' into ivas-float-update-cmplx