RED-1484 done.