FKF6458-3546

Enforced returns