Review followup https://sbforge.org/fisheye/cru/CR-DOMS-59