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