JRT5666-3562

Enforced returns