Merge origin/master
Change getIterator and undo effectiveDate in constructor
EffectiveDate not final (after, we can only set once)