Merged from glNext