Revert "Spike 35 Complete"

This reverts commit 97e32d577cbf716a9978cfefea0daef157b0f222.
Merge remote-tracking branch 'origin/Spike36'
Merge remote-tracking branch 'origin/master' into Spike38