OAE4373-4416

Enforced returns