Merge branch 'log-rescedule'