TTO7598-4268

Enforced returns