Signed-off-by: Bernd Stübinger <41049452+stuebingerb@users.noreply.github.com>
(cherry picked from commit b93d4a4a)