Workaround in dost_shm_repository EnumDescription
Merge branch 'master' into stewart