jira: STUDIO-14877 Change-Id: Ia65fcc706c255072dd78bfcfc80abc6e17fe213a (cherry picked from commit 501991eaf9ac7cb1bf7b0bafa1213014e6b09e2e)
jira: STUDIO-14877 Change-Id: Ia65fcc706c255072dd78bfcfc80abc6e17fe213a (cherry picked from commit 501991eaf9ac7cb1bf7b0bafa1213014e6b09e2e)