RPU6873-1654

Enforced returns