Merged -nogl update by gnomino