jira:[STUDIO-9169] Change-Id: I62e61f9ca01b4d04b0ef204df1694d8d0fbc06b2 (cherry picked from commit 2b1f8887ef3ec4e7d1b9dbbd10baeebd6cda7638)
jira:[STUDIO-9169] Change-Id: I62e61f9ca01b4d04b0ef204df1694d8d0fbc06b2 (cherry picked from commit 2b1f8887ef3ec4e7d1b9dbbd10baeebd6cda7638)