fix issue with the scenario when i have a property in one of the root trait class
Reviewer: Dan Jao (post-commit)
merge with master