Merge "Backport LocCharacterization." into main