Merge "CIS compliance (modprobe.d)"