Related: #146 (closed)
(cherry picked from commit de561677)
Co-authored-by: michael.danielczok michael@pcsg.de