Update September 18

Fixed issues due to EDX Platform latest updates