Merge branch 'ivas-float-update' into ci/use-ci-from-main