[TIDOC-1861] Updates