EDX-423: 11st commit