Port MR 1504 from float

Basic Info