[TIDOC-1515] Address PR comment