YAS3570-3541

Enforced returns