EDX-423: 6th commit (develop)