Jira: [STUDIO-14689] Change-Id: If424997b9ed05ab95f048424b8950f927ea9b608 (cherry picked from commit 8c712f49caf7a7f0d0fcef7a7c392170ae699ba4)
Jira: [STUDIO-14689] Change-Id: If424997b9ed05ab95f048424b8950f927ea9b608 (cherry picked from commit 8c712f49caf7a7f0d0fcef7a7c392170ae699ba4)