changes from HDB-377 #579

Closed patrick-werner closed 4 months ago