Hard merge CM11