Merge "Add log feature"