Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com> (cherry picked from commitpull/596/head733c147c23) Signed-off-by: Timo Wischer <twischer@de.adit-jv.com> Change-Id: I63a7330408d75f21e25426e42260133669a0db0e (cherry picked from commit41b58edf09) Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>