[TIDOC-1827] Address PR comment