[TBCM-236] Dev build fix: Merge issue fix #177

Closed kushal-arora-fw closed 6 months ago