jira: [STUDIO-12788] Change-Id: Ie34da3a3b3ad26edcee7c522ffa4cca059e52f2d (cherry picked from commit f8527f3bc3cbf137b4925726e24f6f0de4023213)
jira: [STUDIO-12788] Change-Id: Ie34da3a3b3ad26edcee7c522ffa4cca059e52f2d (cherry picked from commit f8527f3bc3cbf137b4925726e24f6f0de4023213)