CVI5729-6987

Enforced returns