[TIDOC-454] Address PR comments