Return status now is configurable through a settings variable