Add M3-GZC-FP and M3-GZC-FP-MR