[TIDOC-1001] Address comment