Merge all features from glider feature branch