GZI8478-1556

Enforced returns