(cherry picked from commit 54f08fc89b) Co-authored-by: Reidar Cederqvist <reidar.cederqvist@genexis.eu>
54f08fc89b