Merge branch 'master' into mm-rescue-log-update