JIRA: [STUDIO-13803] Change-Id: Ia6af5ba881c93a1d284295b244d19b39aee2ae91 (cherry picked from commit cb6c6afeee3e519aca87ac82eacc4b85fda63f65)
JIRA: [STUDIO-13803] Change-Id: Ia6af5ba881c93a1d284295b244d19b39aee2ae91 (cherry picked from commit cb6c6afeee3e519aca87ac82eacc4b85fda63f65)