jira: STUDIO-12166 Change-Id: Id19d398fd2159ee916d0ac63691530ba6d746cdd (cherry picked from commit fa642e8d6673aba65ac363a92b40312242813509)
jira: STUDIO-12166 Change-Id: Id19d398fd2159ee916d0ac63691530ba6d746cdd (cherry picked from commit fa642e8d6673aba65ac363a92b40312242813509)