DESK-37: finish