Jira: [STUDIO-14325] Change-Id: Ie84083a3673fc1300996b1564d26d1b58e2b55ee (cherry picked from commit e8bb9e674115f7da01ba26c1f704e37e739b21a2)
Jira: [STUDIO-14325] Change-Id: Ie84083a3673fc1300996b1564d26d1b58e2b55ee (cherry picked from commit e8bb9e674115f7da01ba26c1f704e37e739b21a2)