jira: STUDIO-9989 Change-Id: I7be626e8c86f684029a4c34fc8b800b880fe1fcd (cherry picked from commit 1ea13f9846e5b66b0304cd4b6bcbfbb21d8919d8)
jira: STUDIO-9989 Change-Id: I7be626e8c86f684029a4c34fc8b800b880fe1fcd (cherry picked from commit 1ea13f9846e5b66b0304cd4b6bcbfbb21d8919d8)