Conflicts for Model_redesigns

This branch contains the merged and conflict-resolved model_redesigns.