Merge branch 'align-glide-upstream'