jira:[STUDIO-13716][STUDIO-14124] Change-Id: Ia793986f1891c2ee57c95a6db536e71f725ddb3c (cherry picked from commit e29b9cf3a319666c896fc839329448dde435c46d)