Add PI1.2.1 SAP2 support and UEFI231B mantis 896