JIRA: [STUDIO-13609] Change-Id: I591de7033360b9570600006cfbce2148a8d031d5 (cherry picked from commit e9c774be8f4c89b8dafa14ef56913612fb68bd0c)
jira: [STUDIO-9275] Change-Id: I8105828183d42496eed77793daa1c1a618e252bf (cherry picked from commit 478fc597c4b0f054c93bef954f3ca1054111b4b3)