[TIDOC-1352] Update per comments