[TIDOC-1038] Address comments