Issue #2122433: rework messaging around fu/fe