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