EDX-423: 9th commit (develop2)