jira:[STUDIO-10746] Change-Id: If97e8c6f0f371be88065edc1deba474bfb82f845 (cherry picked from commit ff08b3ec34773232b53a29b385cda96ce62cdf8a)
jira:[STUDIO-10746] Change-Id: If97e8c6f0f371be88065edc1deba474bfb82f845 (cherry picked from commit ff08b3ec34773232b53a29b385cda96ce62cdf8a)