jira: [STUDIO-9617] Change-Id: I39eacc70067e58916b16433031fdc69af7b379f3 (cherry picked from commit 48c7d6b77018946db3246e4cbfaf0a81a0ec009f)
jira: [STUDIO-9617] Change-Id: I39eacc70067e58916b16433031fdc69af7b379f3 (cherry picked from commit 48c7d6b77018946db3246e4cbfaf0a81a0ec009f)