[TIDOC-1127] Address comment