jira: [STUDIO-12075] Change-Id: I3b18940513b2628a45fb51d707921607ac1511a3 (cherry picked from commit acbc1fa3406563872ab4a4f79546fb7f530aef4b) (cherry picked from commit 79f0f1a1fbede91df82175e6b8fe22457a622229)
jira: [STUDIO-12075] Change-Id: I3b18940513b2628a45fb51d707921607ac1511a3 (cherry picked from commit acbc1fa3406563872ab4a4f79546fb7f530aef4b) (cherry picked from commit 79f0f1a1fbede91df82175e6b8fe22457a622229)