[TIDOC-1916] Address PR comment