[TIDOC-1897] Address PR comments