EDX-423: 15th commit