Restore Job::Iterator package
Merge branch 'my_annotation' into gb_master