Fixing STUDIO-4429