jira: STUDIO-9946 Change-Id: Ic8f369972c598c812e30d197927fa5fb63be133b (cherry picked from commit 7897cd68c99392f1b6254b8d436b1d54c8565942)
jira: STUDIO-9946 Change-Id: Ic8f369972c598c812e30d197927fa5fb63be133b (cherry picked from commit 7897cd68c99392f1b6254b8d436b1d54c8565942)