Merge branch 'massive-log-extension'