Merge branch 'cherry-pick-b940cfc1' into 'test'

Merge branch 'remove-henhe83' into 'devel'

See merge request !21 (merged)

(cherry picked from commit 3fdaab52)

aced0ff5 Merge branch 'remove-henhe83' into 'devel'

assigned to @mikpe74

enabled an automatic merge when the pipeline for 7a59b2ac succeeds

merged

mentioned in commit 000e0610