NHB8296-2076

Enforced returns