jira:[STUDIO-14555][STUDIO-14125] Change-Id: Iefd35c16fce9396d54bcb847291094346f987b28 (cherry picked from commit 2f1d921d8d76bc0235eca139801a106fca3c3cf6)