[TIDOC-1548] Address PR comments