jira: STUDIO-9928 STUDIO-9934 Change-Id: Ica81cb037ff0b99cc53a762b280a666e8c832ab3 (cherry picked from commit eeb474d2cee9187961db1941be952f806ff6c76d)
jira: STUDIO-9928 STUDIO-9934 Change-Id: Ica81cb037ff0b99cc53a762b280a666e8c832ab3 (cherry picked from commit eeb474d2cee9187961db1941be952f806ff6c76d)