Looks like 8104 has a PR open; do you want to get that one merged and remove this note before merging this one?