[TIDOC-1210] Address comment