jira: [STUDIO-9148] [STUDIO-9348] [STUDIO-9390] Change-Id: I7fe2a4744a9b21db990ac819873817b0b5c0820b (cherry picked from commit 8891bbcf17574b67ba507c9223c57acea59afd1f)
jira: [STUDIO-9148] [STUDIO-9348] [STUDIO-9390] Change-Id: I7fe2a4744a9b21db990ac819873817b0b5c0820b (cherry picked from commit 8891bbcf17574b67ba507c9223c57acea59afd1f)