DTQ4080-5091

Enforced returns