jira: STUDIO-11441 Change-Id: I89dc4bfaca61958773f7dfadf2983ff3f9cb6da1 (cherry picked from commit f42e47b7456fde2ef01ae9c3327f7c0ce9d8f174)
jira: STUDIO-11441 Change-Id: I89dc4bfaca61958773f7dfadf2983ff3f9cb6da1 (cherry picked from commit f42e47b7456fde2ef01ae9c3327f7c0ce9d8f174)