RKF4774-7055

Enforced returns