RED-2275 finished, RED-2273 in progress