Merge "Refactor LocalEventLog for safety and split locations log"