KRACOEUS-7513 : Temporary workaround to avoid auto-growing of references
Merge pull request #576 from blackcathacker/null_refs

KRACOEUS-7513 : Temporary workaround to avoid auto-growing of references