Next round, could not include logs
Merge remote-tracking branch 'upstream/master'