[CLC-2111] Spare extra object allocation
Merge pull request #1270 from yuhunglin/CLC-2111

[CLC-2111] Spare extra object allocation