jira: [STUDIO-14159] Change-Id: Idde4d1c366024b49d474d8802d9f912711ea3991 (cherry picked from commit 5bdf315e6f68e2e27036e348e70402df38f4c49f)
jira: [STUDIO-14159] Change-Id: Idde4d1c366024b49d474d8802d9f912711ea3991 (cherry picked from commit 5bdf315e6f68e2e27036e348e70402df38f4c49f)