jira: STUDIO-9595 Change-Id: I9908d3eff394ada12dd9ab0a2c10ca8a78d4f1f6 (cherry picked from commit 8bafed6e0a0ac7237077e7e0a964706e35e5ed12)