jira: STUDIO-9658 Change-Id: Iad5bd087337e7d0540f0da4cdb25873f4f1ac6fb (cherry picked from commit ce54aa8a8408789ae21dc2091da12dec36e8be21)
jira: STUDIO-9658 Change-Id: Iad5bd087337e7d0540f0da4cdb25873f4f1ac6fb (cherry picked from commit ce54aa8a8408789ae21dc2091da12dec36e8be21)