Merge "Selectively load kernel modules based on current kernel number"