Merge branch 'randconfig/mach' into fixes