[TIDOC-826] Address comments