including non public types in scan
Merge branch 'develop'