[TIDOC-1315] Update per comments