NZB3747-5812

Enforced returns