Merge SamplingFeatures feature_branch2

Result of a long discussion at our March 13 meeting.