(cherry picked from commit 246348501c) Co-authored-by: Oana Horvath <oana.horvath@softvision.ro>
246348501c