merge
Merge origin/master
reflection utils + fixes in annotation resolving