jira: STUDIO-13303 Change-Id: Ic80224dc371247c4571a2f5471b68c011344621b (cherry picked from commit 0ac418508c86709cd91b18268a1b33d209008f3d) (cherry picked from commit b7f9cd292cb352891045f4b26924669ba0252231)
jira: STUDIO-13303 Change-Id: Ic80224dc371247c4571a2f5471b68c011344621b (cherry picked from commit 0ac418508c86709cd91b18268a1b33d209008f3d) (cherry picked from commit b7f9cd292cb352891045f4b26924669ba0252231)