Merged
Updated settlement handling