Change collecting event tag to reference verbatim_locality instead of cached
Merge remote-tracking branch 'origin/master'