Merge branch 'release/0.6.0'
FQDN Inject annotation
Merge branch 'hotfix/at-inject' into develop