CXM5049-5735

Enforced returns