log annotation
Merge branch 'log'