jira: [STUDIO-10781] Change-Id: I8cbb893f235a47a9ed62e43af8c00dc1ba1f6454 (cherry picked from commit d89303c9fee19eadba9acc615da09f446da25354)
jira: [STUDIO-10781] Change-Id: I8cbb893f235a47a9ed62e43af8c00dc1ba1f6454 (cherry picked from commit d89303c9fee19eadba9acc615da09f446da25354)