[TIDOC-1133] Address comment