Fixing STUDIO-4335