[TIDOC-944] Updates per comments