Merge "Add local log" into sc-dev