STUDIO-2666 + STUDIO-2667