DEVIDM-94: Moved annotations to make sure the aspect can find them.
Merge pull request #95 from iceglow/DEVIDM-94

DEVIDM-94: Moved annotations to make sure the aspect can find them.