FIST/PALM differentiation
merge from master