Jira: STUDIO-14550 Change-Id: I22a24f674370b3c04fb92b48cb9f229123e41e8a (cherry picked from commit 7597a4a95e19d882eabb404f20f98955752b5730)
Jira: STUDIO-14550 Change-Id: I22a24f674370b3c04fb92b48cb9f229123e41e8a (cherry picked from commit 7597a4a95e19d882eabb404f20f98955752b5730)