Merge "Add local log"