Merge "gn2bp: delete obsolete version in p/m/C"