Signed-off-by: Artem Torubarov <artem.torubarov@sap.com> (cherry picked from commit 7ee062bc06)
7ee062bc06