HXX5624-5987

Enforced returns