jira: STUDIO-9948 STUDIO-9950 Change-Id: Ic97dfb7787c9e27386003b2dc3f88f1003456245 (cherry picked from commit 081df8f5809dc023487b239dc1419b20eacc7a40)