Updates as per rt #120270