Merged more changes by Sebastian