jira: [STUDIO-12188] Change-Id: I0d38bcab502415dd733d9b58835e1e50dd00bd22 (cherry picked from commit 2b8edfccc866af927f8c791521eecde182946cee)