Port MR1698 from float

Basic Info