ID#218: added migration script part for iterator place holder with generic getter.
Merge remote-tracking branch 'origin/master'