jira:[STUDIO-14604][STUDIO-14660][STUDIO-14662] Change-Id: I71833726fb3533960e38f87324b7d3da566730d7 (cherry picked from commit 7e6a18c81d92517e5f421569d103502e44c703a5)
jira:[STUDIO-14604][STUDIO-14660][STUDIO-14662] Change-Id: I71833726fb3533960e38f87324b7d3da566730d7 (cherry picked from commit 7e6a18c81d92517e5f421569d103502e44c703a5)