EDX-423: 4th commit (develop)