Merged up from master, fixed conflicts
Fixed conflicts with master