jira: STUDIO-10569 Change-Id: Iad518db29206d16bb59b5a938623d351862a190a (cherry picked from commit e71adc067cf3284d054dc37dc588ab9161de01f7)
jira: STUDIO-10569 Change-Id: Iad518db29206d16bb59b5a938623d351862a190a (cherry picked from commit e71adc067cf3284d054dc37dc588ab9161de01f7)