[TIDOC-1861] More changes