jira: STUDIO-12834 Change-Id: I892219350d6dd46bc92037c146af1911214d598d (cherry picked from commit b86677be4e5771da4362ea41dfeb3a161fcc33f7)
jira: STUDIO-12834 Change-Id: I892219350d6dd46bc92037c146af1911214d598d (cherry picked from commit b86677be4e5771da4362ea41dfeb3a161fcc33f7)