Merged stable features from edu branch