jira: [STUDIO-10771] [Studio-10608] Change-Id: I6af3409ebdc7c173b2cfcd6745854e928753dff1 (cherry picked from commit 04e45e4a6e4e4fbc2b3664d29a17b508b7b58f24)
jira: [STUDIO-10771] [Studio-10608] Change-Id: I6af3409ebdc7c173b2cfcd6745854e928753dff1 (cherry picked from commit 04e45e4a6e4e4fbc2b3664d29a17b508b7b58f24)