Merge branch 'ivas-float-update' into merge-ivas-fl-up-to-float-pc