JIRA: [STUDIO-14047] Change-Id: I28736dc7c55a842744b2d3f8731e92384c2ea929 (cherry picked from commit 602541e42b0a7ad6faa3ff604435bc36a1cc1f3f)
JIRA: [STUDIO-13609] Change-Id: I591de7033360b9570600006cfbce2148a8d031d5 (cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)