jira: [STUDIO-12346] Change-Id: I7f5ce7806acb6fdeb3e3d9db52a0b96e5fadd759 (cherry picked from commit a7bdc2707d3825327258965c90c33836a7da628b)
jira: [STUDIO-12346] Change-Id: I7f5ce7806acb6fdeb3e3d9db52a0b96e5fadd759 (cherry picked from commit a7bdc2707d3825327258965c90c33836a7da628b)