@redmunds and I discussed separately to try to merge #6997, then #7008, then re-evaluate this #6889.