CAF7805-1623

Enforced returns