jira: [STUDIO-9646] Change-Id: I88dcce6990e97ddea24d5726a3c728a5efd1fd6c (cherry picked from commit b40306ac22aece60ebe1646534d1482020a84e6d)
jira: [STUDIO-9646] Change-Id: I88dcce6990e97ddea24d5726a3c728a5efd1fd6c (cherry picked from commit b40306ac22aece60ebe1646534d1482020a84e6d)