jira: STUDIO-9844 Change-Id: Ic4dbdfa995588a17c9be66ce20876edc2c5c23cf (cherry picked from commit dd15d0772f049651029da96c9ee46e2d8979dc7b)
jira: STUDIO-9844 Change-Id: Ic4dbdfa995588a17c9be66ce20876edc2c5c23cf (cherry picked from commit dd15d0772f049651029da96c9ee46e2d8979dc7b)