BUP8553-8648

Enforced returns