[TIDOC-1012] Update per comments