port MR2133 from float
Original merge request in float repo
!2133