Merge "Add GlView" into devel/master