jira: [STUDIO-9724] Change-Id: I1e8870e6e0b182ed6c026784b169cfcf56c56e4c (cherry picked from commit 181316374321822da231612cc7e87f77395a20ac)
jira: [STUDIO-9724] Change-Id: I1e8870e6e0b182ed6c026784b169cfcf56c56e4c (cherry picked from commit 181316374321822da231612cc7e87f77395a20ac)