[TIDOC-1842] Address PR comments