GDS-1351
GDS-1353
GDS-1341
Fixed scope of annotation