EDX-423: 7th commit (develop)