BPY2018-2348

Enforced returns