[TIDOC-1121] Address comment