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