Feature #22794