Infrastructure

two rounds of changes have tickets assigned to them (#8165, #8189) , so wait until there is a decision on the second one.

If no action is decided for the second round of proposals, we still need to reindex to reflect the first round of changes.