[TIDOC-1328] Address PR comment