Merge branch 'all_log'