merging docents changes