jira: [STUDIO-11777] Change-Id: Idac7b7835f13ec1805442a8c8aefbb35786c36ef (cherry picked from commit 6c07f1b9a2858a9ab0c52330f78224a03ffb6f0c)
jira: [STUDIO-11777] Change-Id: Idac7b7835f13ec1805442a8c8aefbb35786c36ef (cherry picked from commit 6c07f1b9a2858a9ab0c52330f78224a03ffb6f0c)