Merge branch 'hotfix_1.5.1'
fix: bug with null name given in the addressMap for textServlet
Merge branch 'hotfix_1.5.2' into develop