Try to fix merge from master to docManagment