[TIDOC-1788] Address JIRA comments