[TIDOC-1045] Update per comments