[TIDOC-1035] Update per comments