FQDN Inject annotation
Merge branch 'hotfix/at-inject'