Follow-ups from https://sbforge.org/fisheye/cru/CR-NEWSPAPER-129