[TIDOC-1313] Address PR comments