Feature #6443