jira: [STUDIO-10732] Change-Id: I5437c4ef1538f0022f97c7ef7fb40ec2242328ed (cherry picked from commit f5c49c89a80e508a442440218b068446d1e9e797)