GRECLIPSE-1731 Fix and test for missing annotations