jira: [STUDIO-9148] Change-Id: Idd50664e0f9c55fe5e8d7e0a840948fd82dafc15 (cherry picked from commit b79f6243474e5d96cf51719001564d38abf0f5a7)
jira: [STUDIO-9148] Change-Id: Idd50664e0f9c55fe5e8d7e0a840948fd82dafc15 (cherry picked from commit b79f6243474e5d96cf51719001564d38abf0f5a7)