Merge branch 'remove-henhe83' into 'devel'
See merge request !21 (merged)
(cherry picked from commit 3fdaab52)
aced0ff5 Merge branch 'remove-henhe83' into 'devel'