OPS6536-7138

Enforced returns