[TIDOC-740] Update per discussion