Handling Roster Pushes
Merge remote-tracking branch 'origin/Simplification' into Simplification
Fixed errant merge