EDX-423: 8th commit (develop2)