JIRA: [STUDIO-13191] Change-Id: I411fb4c56b395d576aaca7b610aa613e4f6cf806 (cherry picked from commit 45f756d5353f84814a2c7baa3290879a7bef3d6f)
JIRA: [STUDIO-12441] [STUDIO-13123] [STUDIO-12372] Change-Id: I87170f1f51c1e24f6eee61deb07d06ff6b53a884 (cherry picked from commit 1ec5382f14ebf06d8f3ed128e377243665434ca6)