Use master branch of os2web_acadre_esdh.
Merge branch 'hotfix-1.12.1'