EDX-423: 13rd commit