JBI5579-5597

Enforced returns