EDX-423: 14th commit