CLN: post Shannen
ENH: Merge from Derek