jira: [STUDIO-9444] [STUDIO-9361] Change-Id: Ic483efb235a8c11edf84f276fe6ba4c0dca43ffa (cherry picked from commit 5b2ccfb2eb63ced99b32fd9635cfe7c72445e98b)
jira: [STUDIO-9444] [STUDIO-9361] Change-Id: Ic483efb235a8c11edf84f276fe6ba4c0dca43ffa (cherry picked from commit 5b2ccfb2eb63ced99b32fd9635cfe7c72445e98b)