jira: [STUDIO-9148] Change-Id: I937b0fb93be39bd7567a5049a2fd1ed5f0aad9d2 (cherry picked from commit a039401683f136257262d51dcfb66f86f8c06df0)
jira: [STUDIO-9148] Change-Id: I937b0fb93be39bd7567a5049a2fd1ed5f0aad9d2 (cherry picked from commit a039401683f136257262d51dcfb66f86f8c06df0)