jira: STUDIO-8778 STUDIO-8824 Change-Id: Iecb0a52a100c3f0765e5eda07e0ed50226490e42 (cherry picked from commit 16791c72d62eabef96011ddc117b329385c5aa68)