EDX-423: 5th commit