jira: STUDIO-8143 STUDIO-8142 Change-Id: I50abb78f9585378d3ef7278377dfb35d5db6189d (cherry picked from commit 00a6e17c6c21e741f8427f6841047fe49e6330cf)
jira: STUDIO-8143 STUDIO-8142 Change-Id: I50abb78f9585378d3ef7278377dfb35d5db6189d (cherry picked from commit 00a6e17c6c21e741f8427f6841047fe49e6330cf)