[TIDOC-1788] Address PR comment