Find the imported annotation model correctly.
Merge branch 'updated' into gb_master