4/22 updates : around discussion (#EDX-350)