merge from trunk : filter out special persons and slices