[TIDOC-1039] Updates per comments