to rebase -- missing not null check on configuration.annotationModel