Merge branch 'master' into revive-multilevel-scan