RED-36592 Revved version