OpenDMIS-6.0-enhancements-1