[1602] Replace v2 of OGL with v3