CFX4990-1645

Enforced returns