[TIDOC-1490] Address PR comments