HOQ8714-8584

Enforced returns