Revert "Revert "Updated to latest mid sprint""

This reverts commit 8e2c4f4468aa757291b8381abd0b36a4680afb2a.