EDX-423: 10th commit