Merge "Add support for traits in ClassCollector"