jira: [STUDIO-9684] Change-Id: I3145d86ad5f6fccd54ab3116e14bcbcbbe1134cf (cherry picked from commit 37c0e0e1c5bce00250ffaf7c27e8f42f5108e361)
jira: [STUDIO-9684] Change-Id: I3145d86ad5f6fccd54ab3116e14bcbcbbe1134cf (cherry picked from commit 37c0e0e1c5bce00250ffaf7c27e8f42f5108e361)