issue #21684: update todos