[TIDOC-1487] Address PR comments