New import sources
Merge branch 'updated' into gb_master