DVS5978-1912

Enforced returns