jira: STUDIO-9971 Change-Id: I699912b4d18cb52aec2badf64a4655d20559ed7c (cherry picked from commit f608327a108c1eece45ee75bde0c3aa35974f166)
jira: STUDIO-9971 Change-Id: I699912b4d18cb52aec2badf64a4655d20559ed7c (cherry picked from commit f608327a108c1eece45ee75bde0c3aa35974f166)