jira: [STUDIO-9154] Change-Id: Iadaa5479eb9770c795f2ebc45c8e5305c2c5640b (cherry picked from commit 27c99677edee337bdda8b947508ff0d586eb1493)
jira: [STUDIO-9154] Change-Id: Iadaa5479eb9770c795f2ebc45c8e5305c2c5640b (cherry picked from commit 27c99677edee337bdda8b947508ff0d586eb1493)