Change-Id: I40643e9d358be89c87a0311b1c1fd7718ec75361 Closes-Bug: #1377781 Co-Authored-By: David Rabel <rabel@b1-systems.de>