GLIDE: Update from upstream